Add INCLUDEDIR. Use it.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 0399eb1b4bc75fb4a6f886dbb1d3a4e4ceb61a42..4230923d4e2307a8af01de6263c30941bdb2ec70 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -18,6 +18,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
+INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib64
 

diff --git a/config/SunOS.mk b/config/SunOS.mk
index ce104473fd9cfa3d29bb0bddd4e082e8b2e0cfc8..a76891b3815f87dfc9d1eecb8b0bb2a714d78293 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -19,6 +19,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
+INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib/amd64
 

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index d06bbf9a9d13df1a0a0982b290f4fb3c3cc9c5e7..844295f398a30aed274fc84aec6565d4ba9f0c42 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -41,11 +41,11 @@ libblktap: libblktap.a
 
 install: all
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DIR) $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
        ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
        ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
-       $(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
+       $(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
 
 clean:
        rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS

diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile
index 719e1f79d1f60bb692547af750b5050555cac3bf..b6c086c0c2db8eed638b6445074bab989d2aab58 100644 (file)
--- a/tools/flask/libflask/Makefile
+++ b/tools/flask/libflask/Makefile
@@ -34,12 +34,12 @@ build:
 .PHONY: install
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
        ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
        ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
-       $(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
+       $(INSTALL_DATA) include/flask.h $(DESTDIR)$(INCLUDEDIR)
 
 .PHONY: TAGS
 TAGS:

diff --git a/tools/guest-headers/Makefile b/tools/guest-headers/Makefile
index 898ac34a10a2896ad03668c2ffac7441db13673c..7984f201b2b9720b3cd91e68b0c912a72cab44f7 100644 (file)
--- a/tools/guest-headers/Makefile
+++ b/tools/guest-headers/Makefile
@@ -10,8 +10,8 @@ check:
 .PHONY: install
 
 install:
-       mkdir -p $(DESTDIR)/usr/include/xen/sys
-       $(INSTALL_DATA) $(XEN_ROOT)/tools/include/$(XEN_OS)/*.h $(DESTDIR)/usr/include/xen/sys
+       mkdir -p $(DESTDIR)$(INCLUDEDIR)/xen/sys
+       $(INSTALL_DATA) $(XEN_ROOT)/tools/include/$(XEN_OS)/*.h $(DESTDIR)$(INCLUDEDIR)/xen/sys
 
 .PHONY: clean
 clean:

diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index ddf1d6a145c127c3e4fdeced9e542f2b7703e030..641bca53b3a7945784e5111275ca78da1b73fe50 100644 (file)
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -23,13 +23,13 @@ all: $(LIB)
 .PHONY: install
 install: all
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
        ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
-       $(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
-       $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
-       $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
+       $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
 
 clean distclean:
        rm -f $(PIC_OBJS) $(LIB) $(DEPS)

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 7d0e9fa846b4b59de01a31fa1c5b93cca910f894..6a4c0aaa0ea68f28e328769bcf2063d35a239af6 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -104,18 +104,18 @@ check-for-zlib:
 .PHONY: install
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
        ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
        ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
-       $(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
+       $(INSTALL_DATA) xenctrl.h $(DESTDIR)$(INCLUDEDIR)
 
        $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
        ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
        ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
-       $(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
+       $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
 
 .PHONY: TAGS
 TAGS:

diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile
index 8480e3a91714a256673c9407bc70338197d34bb5..0d1ec7727b2521de450c1cce92d4d051469ac1ac 100644 (file)
--- a/tools/libxen/Makefile
+++ b/tools/libxen/Makefile
@@ -55,14 +55,14 @@ $(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
+       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
        ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
        $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
        set -e; for i in $(LIBXENAPI_HDRS); do \
-           $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
+           $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \
        done
 
 

diff --git a/tools/libxen/Makefile.dist b/tools/libxen/Makefile.dist
index 6c76433de10635075353191484b01ffa5150b4aa..23a4b13490bbbfe77e1d236f3108ebd56d81c6f6 100644 (file)
--- a/tools/libxen/Makefile.dist
+++ b/tools/libxen/Makefile.dist
@@ -65,14 +65,14 @@ $(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
+       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
        ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
        $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
        set -e; for i in $(LIBXENAPI_HDRS); do \
-           $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
+           $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \
        done
 
 

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index b1a8d570c42ea29ea62900f8200d7aebff282b8f..2652b1e3ec464772dfdd5b30ff3aa0d18a291fa6 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -83,7 +83,7 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
        $(INSTALL_DIR) $(DESTDIR)/usr/bin
        $(INSTALL_DIR) $(DESTDIR)/usr/sbin
-       $(INSTALL_DIR) $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
        $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
        $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
@@ -93,8 +93,8 @@ install: all
        ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
        ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
        $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
-       $(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
+       $(INSTALL_DATA) xs.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) xs_lib.h $(DESTDIR)$(INCLUDEDIR)
 
 -include $(PROG_DEP)